*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7279d1d70e9bea8714cdf1514f6d6b10d9419edc..b22395349d4cf24038ead2de25a8d54dd323c59e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-02  Kenichi Handa  <handa@m17n.org>
+
+       * files.el (hack-local-variables-prop-line): Ignore `char-trans'
+       as well as `coding'.
+       (hack-local-variables): Likewise.
+
+       * international/mule.el (enable-character-translation): Put
+       permanent-local and safe-local-variable properties.
+       (find-auto-coding): Handle char-trans: tag.
+
 2006-06-02  Juri Linkov  <juri@jurta.org>
 
        * international/mule.el (sgml-html-meta-auto-coding-function):